Merged.

diff --git a/tools/examples/xen-backend.agent b/tools/examples/xen-backend.agent
index 3c83489f1feb281f083c7f554cf420189d2af3f0..670c24b77515c5725f735478cff6f6931ecca9b6 100755 (executable)
--- a/tools/examples/xen-backend.agent
+++ b/tools/examples/xen-backend.agent
@@ -18,12 +18,7 @@ case "$ACTION" in
   add)
     ;;
   remove)
-    # remove device frontend store entries
-    xenstore-rm -t $(xenstore-read "$XENBUS_PATH/frontend") || true
-
-    # remove device backend store entries
-    xenstore-rm -t "$XENBUS_PATH"       || true
-    xenstore-rm -t "error/$XENBUS_PATH" || true
+    /etc/xen/scripts/xen-hotplug-cleanup.sh
     ;;
   online)
     ;;